From: Glenn Morris Date: Tue, 18 Jan 2011 02:49:59 +0000 (-0800) Subject: Merge from emacs-23 branch, up to r100386. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5161 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cc8c9d22b29696a7bf006c7a0f31d64c6cf3aff4;p=emacs.git Merge from emacs-23 branch, up to r100386. --- cc8c9d22b29696a7bf006c7a0f31d64c6cf3aff4 diff --cc etc/ChangeLog index eba668a69c7,1beb2fa23d4..75a44c2d944 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@@ -1,4 -1,8 +1,8 @@@ + 2011-01-18 Glenn Morris + + * PROBLEMS: Add note about svn+ssh. (Bug#7791) + -2011-01-03 Glenn Morris +2011-01-14 Glenn Morris * refcards/calccard.tex, refcards/cs-dired-ref.tex: * refcards/cs-refcard.tex, refcards/cs-survival.tex: diff --cc lisp/ChangeLog index 88718206a3a,06bf48e96e0..3e408b4e718 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,55 -1,8 +1,60 @@@ -2011-01-17 Stefan Monnier ++2011-01-18 Stefan Monnier + + * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the + keymap expression. Improve docstring. + +2011-01-18 Stefan Monnier + + * electric.el (electric-indent-post-self-insert-function): + Don't auto-indent for indent-to-left-margin, it's too often + counter-productive. + +2011-01-16 Tassilo Horn + + * strokes.el (strokes-read-stroke): Re-fill strokes buffer with + spaces if the frame was resized, so that the full visible buffer + serves as canvas for strokes. + +2011-01-16 Glenn Morris + + * info-xref.el (info-xref-docstrings): Replace cl function. + Also skip directories. + +2011-01-16 Kevin Ryde + + * info-xref.el: Version 3. + (info-xref-check, info-xref-check-all): Move commentary details + into docstrings for better visibility. + Use compilation-mode for the results buffer. + (info-xref-output, info-xref-output-error, info-xref-with-output) + (info-xref-filename, info-xref-in-progress): + New internals for this. + (info-xref-check-list, info-xref-check-buffer) + (info-xref-check-all-custom): Use those. + (info-xref-output-buffer): Rename from info-xref-results-buffer. + (info-xref-output-heading): Rename from info-xref-filename-heading. + (info-xref-good, info-xref-bad, info-xref-xfile-alist) + (info-xref-filename-heading): Move to output managing section. + (info-xref-docstrings): New command checking "Info node `(foo)Bar'" + (info-xref-lock-file-p, info-xref-with-file): New helpers for it. + (info-xref-subfile-p): Move to generic section with those two. + (info-xref-check-node): New function split from + info-xref-check-buffer, shared by info-xref-docstrings. + (info-xref-goto-node-p): Move to a checking section with that func. + (info-xref-unavail): New counter. + (info-xref-check-node): Use it. + (info-xref-with-output): Show count of unavailables at end of output. + (info-xref-all-info-files): Exclude ".*" dotfiles. Ignore broken + symlinks. Exclude .texi files. Exclude Emacs backup files. + (info-xref-check-all-custom): Fix quietening viper-mode and + gnus-registry-install -- use setq not let so as not to unbind + after load. + +2011-01-16 Juri Linkov + + * isearch.el (isearch-abort): Don't quit if search has + an incomplete regexp (isearch-error is non-nil). (Bug#7534) + 2011-01-15 Mark Diekhans * files.el (backup-buffer): Make last-resort backup file in diff --cc lisp/emacs-lisp/easy-mmode.el index 3d18d8e1cca,3876e291d1b..7f7198c36c9 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@@ -274,18 -257,12 +275,18 @@@ With zero or negative ARG turn mode off (let ((m ,keymap)) (cond ((keymapp m) m) ((listp m) (easy-mmode-define-keymap m)) - (t (error "Invalid keymap %S" ,keymap)))) + (t (error "Invalid keymap %S" m)))) ,(format "Keymap for `%s'." mode-name))) - (add-minor-mode ',mode ',lighter - ,(if keymap keymap-sym - `(if (boundp ',keymap-sym) ,keymap-sym)))))) + ,(if (not (symbolp mode)) + (if (or lighter keymap) + (error ":lighter and :keymap unsupported with mode expression %s" mode)) + `(with-no-warnings + (add-minor-mode ',mode ',lighter + ,(if keymap keymap-sym + `(if (boundp ',keymap-sym) ,keymap-sym)) + nil + ,(unless (eq mode modefun) 'modefun))))))) ;;; ;;; make global minor mode diff --cc src/ChangeLog index 0bbf4f5254f,1dae4719ca0..18b66686ea9 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,65 -1,10 +1,69 @@@ -2011-01-16 Stefan Monnier ++2011-01-18 Stefan Monnier + + * image.c (syms_of_image): Don't access XSYMBOL's internals directly. + -2011-01-16 Eli Zaretskii +2011-01-17 Paul Eggert - * image.c (syms_of_image): Don't use SET_SYMBOL_VALUE. (Bug#7848) + Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350. + * lisp.h (FLOAT_TO_STRING_BUFSIZE): New macro. + * data.c (Fnumber_to_string): Use it. + * print.c (float_to_string, print_object): Likewise. + + Include unilaterally. + * alloc.c, atimer.c, buffer.c, callproc.c, dired.c, dispnew.c, doc.c: + * doprnt.c, editfns.c, emacs.c, fileio.c, filelock.c, fns.c: + * getloadavg.c, getpagesize.h, gmalloc.c, image.c, keyboard.c: + * lread.c, process.c, process.h, ralloc.c, regex.c, sysdep.c: + * systty.h, term.c, termcap.c, xfns.c, xrdb.c, xselect.c, xsmfns.c: + * xterm.c: + Include without worrying about HAVE_UNISTD_H, since + unistd.h is always present now, possibly supplied by gnulib. + + * mktime.c: Remove; moving to ../lib. + + Use gnulib's mktime module. + * deps.mk (mktime.o): Remove rule. + + Use gnulib's ftoastr module. + * print.c: Include ftoastr.h. + (FLT_RADIX, DBL_MANT_DIG, DBL_DIG, DBL_MIN, DOUBLE_DIGITS_BOUND): + Remove; no longer needed. + (float_to_string): Use dtoastr rather than rolling our own code, + which had an off-by-one bug on non-IEEE hosts. + + Automate syncing from gnulib. + * Makefile.in (lib): New macro. + (ALL_CFLAGS): Add -I$(lib) -I$(srcdir)/../lib. + ($(lib)/libgnu.a): New rule. + (temacs$(EXEEXT)): Also link $(lib)/libgnu.a. + + * xfns.c (x_real_positions): Fix signedness of local var 'ign'. + XGetGeometry wants unsigned int *, not int *, for its last 4 args, + so change the type of 'ign' to unsigned int from int. + + * regex.c (analyse_first): Remove unreachable 'continue' statement. + + * xterm.h (struct x_display_info): Remove stray semicolon. + The extra semicolon didn't conform to the C standard. + Problem reported by Sun cc. + + * lisp.h: Redo flags and XSET slightly to avoid overflow diagnostics. + These changes make compilation easier to follow with Sun cc. + (ARRAY_MARK_FLAG): Make it signed, so that it can be assigned to + EMACS_INT values without provoking overflow diagnostics. + (PSEUDOVECTOR_FLAG): Likewise, for consistency. + (XSET) [! USE_LSB_TAG]: Use unsigned left shift to avoid overflow + diagnostic with signed left shift. + + * fileio.c (make_temp_name): Remove unreachable code. + + * fontset.c (free_realized_fontset): Mark unreachable code with if (0). + Previously it was marked by preceding it with "return;", but + Sun cc complains about this. + + * coding.c (decode_coding_emacs_mule): Remove unreachable code. + This is a typo left over from revno 95090 dated 2009-03-06, + which fixed Bug#2370. Caught by Sun cc. 2011-01-15 Martin Rudalics